-
Notifications
You must be signed in to change notification settings - Fork 14.4k
[NFC][TableGen] Minor code cleanup in SearchableTableEmitter #147856
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
@llvm/pr-subscribers-tablegen Author: Rahul Joshi (jurahul) Changes
Full diff: https://github.com/llvm/llvm-project/pull/147856.diff 1 Files Affected:
diff --git a/llvm/utils/TableGen/SearchableTableEmitter.cpp b/llvm/utils/TableGen/SearchableTableEmitter.cpp
index 38fc1ee5e4020..e47e683794029 100644
--- a/llvm/utils/TableGen/SearchableTableEmitter.cpp
+++ b/llvm/utils/TableGen/SearchableTableEmitter.cpp
@@ -31,9 +31,9 @@ using namespace llvm;
#define DEBUG_TYPE "searchable-table-emitter"
static int64_t getAsInt(const Init *B) {
- if (const BitsInit *BI = dyn_cast<BitsInit>(B))
+ if (const auto *BI = dyn_cast<BitsInit>(B))
return *BI->convertInitializerToInt();
- if (const IntInit *II = dyn_cast<IntInit>(B))
+ if (const auto *II = dyn_cast<IntInit>(B))
return II->getValue();
llvm_unreachable("Unexpected initializer");
}
@@ -115,20 +115,20 @@ class SearchableTableEmitter {
std::string primaryRepresentation(SMLoc Loc, const GenericField &Field,
const Init *I) {
- if (const StringInit *SI = dyn_cast<StringInit>(I)) {
+ if (const auto *SI = dyn_cast<StringInit>(I)) {
if (Field.IsCode || SI->hasCodeFormat())
return SI->getValue().str();
else
return SI->getAsString();
- } else if (const BitsInit *BI = dyn_cast<BitsInit>(I))
+ } else if (const auto *BI = dyn_cast<BitsInit>(I)) {
return "0x" + utohexstr(getAsInt(BI));
- else if (const BitInit *BI = dyn_cast<BitInit>(I))
+ } else if (const auto *BI = dyn_cast<BitInit>(I)) {
return BI->getValue() ? "true" : "false";
- else if (Field.IsIntrinsic)
+ } else if (Field.IsIntrinsic) {
return "Intrinsic::" + getIntrinsic(I).EnumName.str();
- else if (Field.IsInstruction)
+ } else if (Field.IsInstruction) {
return I->getAsString();
- else if (Field.Enum) {
+ } else if (Field.Enum) {
auto *Entry = Field.Enum->EntryMap[cast<DefInit>(I)->getDef()];
if (!Entry)
PrintFatalError(Loc,
@@ -140,7 +140,7 @@ class SearchableTableEmitter {
}
bool isIntrinsic(const Init *I) {
- if (const DefInit *DI = dyn_cast<DefInit>(I))
+ if (const auto *DI = dyn_cast<DefInit>(I))
return DI->getDef()->isSubClassOf("Intrinsic");
return false;
}
@@ -162,7 +162,7 @@ class SearchableTableEmitter {
if (Ctx == TypeInTempStruct)
return "std::string";
return "StringRef";
- } else if (const BitsRecTy *BI = dyn_cast<BitsRecTy>(Field.RecType)) {
+ } else if (const auto *BI = dyn_cast<BitsRecTy>(Field.RecType)) {
unsigned NumBits = BI->getNumBits();
if (NumBits <= 8)
return "uint8_t";
@@ -178,8 +178,9 @@ class SearchableTableEmitter {
"' of type bits is too large");
} else if (isa<BitRecTy>(Field.RecType)) {
return "bool";
- } else if (Field.Enum || Field.IsIntrinsic || Field.IsInstruction)
+ } else if (Field.Enum || Field.IsIntrinsic || Field.IsInstruction) {
return "unsigned";
+ }
PrintFatalError(Index.Loc,
Twine("In table '") + Table.Name + "' lookup method '" +
Index.Name + "', key field '" + Field.Name +
@@ -346,8 +347,8 @@ void SearchableTableEmitter::emitLookupFunction(const GenericTable &Table,
std::vector<std::pair<const Record *, unsigned>> Entries;
Entries.reserve(Table.Entries.size());
- for (unsigned i = 0; i < Table.Entries.size(); ++i)
- Entries.emplace_back(Table.Entries[i], i);
+ for (auto [Idx, TblEntry] : enumerate(Table.Entries))
+ Entries.emplace_back(TblEntry, Idx);
llvm::stable_sort(Entries,
[&](const std::pair<const Record *, unsigned> &LHS,
@@ -356,19 +357,19 @@ void SearchableTableEmitter::emitLookupFunction(const GenericTable &Table,
});
IndexRowsStorage.reserve(Entries.size());
- for (const auto &Entry : Entries) {
- IndexRowsStorage.push_back(Entry.first);
+ for (const auto &[EntryRec, EntryIndex] : Entries) {
+ IndexRowsStorage.push_back(EntryRec);
OS << " { ";
ListSeparator LS;
for (const auto &Field : Index.Fields) {
std::string Repr = primaryRepresentation(
- Index.Loc, Field, Entry.first->getValueInit(Field.Name));
+ Index.Loc, Field, EntryRec->getValueInit(Field.Name));
if (isa<StringRecTy>(Field.RecType))
Repr = StringRef(Repr).upper();
OS << LS << Repr;
}
- OS << ", " << Entry.second << " },\n";
+ OS << ", " << EntryIndex << " },\n";
}
OS << " };\n\n";
@@ -385,8 +386,8 @@ void SearchableTableEmitter::emitLookupFunction(const GenericTable &Table,
Index.Fields[0].IsInstruction)) {
int64_t FirstKeyVal = getNumericKey(Index, IndexRows[0]);
IsContiguous = true;
- for (unsigned i = 0; i < IndexRows.size(); ++i) {
- if (getNumericKey(Index, IndexRows[i]) != (FirstKeyVal + i)) {
+ for (const auto &[Idx, IndexRow] : enumerate(IndexRows)) {
+ if (getNumericKey(Index, IndexRow) != FirstKeyVal + (int64_t)Idx) {
IsContiguous = false;
break;
}
@@ -496,9 +497,9 @@ void SearchableTableEmitter::emitLookupFunction(const GenericTable &Table,
OS << " ||\n Key." << Field.Name << " != Idx->" << Field.Name;
}
- if (ShouldReturnRange)
+ if (ShouldReturnRange) {
OS << " return llvm::make_range(It.first, It.second);\n";
- else if (IsPrimary) {
+ } else if (IsPrimary) {
OS << ")\n return nullptr;\n\n";
OS << " return &*Idx;\n";
} else {
@@ -544,8 +545,7 @@ void SearchableTableEmitter::emitGenericTable(const GenericTable &Table,
// The primary data table contains all the fields defined for this map.
OS << "constexpr " << Table.CppTypeName << " " << Table.Name << "[] = {\n";
- for (unsigned i = 0; i < Table.Entries.size(); ++i) {
- const Record *Entry = Table.Entries[i];
+ for (const auto &[Idx, Entry] : enumerate(Table.Entries)) {
OS << " { ";
ListSeparator LS;
@@ -554,7 +554,7 @@ void SearchableTableEmitter::emitGenericTable(const GenericTable &Table,
<< primaryRepresentation(Table.Locs[0], Field,
Entry->getValueInit(Field.Name));
- OS << " }, // " << i << "\n";
+ OS << " }, // " << Idx << "\n";
}
OS << " };\n";
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
- Add braces around if/else bodies per LLVM coding standards. - Use range for loops. - use auto for variables initialized with `dyn_cast`.
8887292
to
1b87517
Compare
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/190/builds/23251 Here is the relevant piece of the build log for the reference
|
dyn_cast
.compareBy
to also use early return in the comparison loop by extracting the comparison into lambdas.